bitkeeper revision 1.1236.12.3 (422d775dKaZ31uEadZ69IypltHcqEQ)

Manual merge.

diff --cc xen/include/xen/sched.h
index 83925b46f59337007e303d9e5fcd45b17ab145b0,254169cd9ffe06a26275764be4ff2b022f852d4e..061f17e50106fea37403ac39d6d850146f9479f4
--- 1/xen/include/xen/sched.h
--- 2/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@@ -139,8 -99,12 +139,11 @@@ struct domai
       */
  #define NR_PIRQS 128 /* Put this somewhere sane! */
      u16 pirq_to_evtchn[NR_PIRQS];
 -    u16 virq_to_evtchn[NR_VIRQS];
      u32 pirq_mask[NR_PIRQS/32];
  
+     /* Last point at which timestamp info was propagated to the guest. */
+     u64 last_propagated_timestamp;
+ 
      /* Physical I/O */
      spinlock_t       pcidev_lock;
      struct list_head pcidev_list;